Skip to content

(DO NOT MERGE) Identity integration branch - #495

Draft
aram356 wants to merge 780 commits into
mainfrom
rc/identity
Draft

aram356 wants to merge 780 commits into
mainfrom
rc/identity

Conversation

@aram356

@aram356 aram356 commented Nov 13, 2026 •

Copy link
Copy Markdown
Collaborator

Summary

  • rc/identity is the integration branch for server-side identity on every adapter (Platform capabilities for server-side identity on every adapter #468). It carries the ready PRs that Trusted Server's Fastly and Axum MVP needs, joined by history-preserving merges, so Trusted Server can pin one revision and CI can test the combined stack.
  • Each included PR keeps its own review and still lands on main by itself. This PR shows the combined diff and its CI.
  • The branch only moves forward. When an included PR's head moves, the new head is merged on top. Trusted Server pins a commit of this branch by SHA ((DO NOT MERGE) Identity integration branch trusted-server#1608); there are no tags.

Included

On main e11ea308. Heads are current at f84ffbbb; earlier heads stay in the history.

PR Head What it brings
#275 ea2549fb Portable outbound HTTP and request lifecycle contracts
#499 c5c6b8e0 Authenticated head facts captured before transport sanitation; #275 review follow-ups
#460 ce94fe06 Outbound cache tags, borrowed readiness and paired time
#406 e37e0df2 Axum production startup and bounded shutdown
#407 d3188b1a Configurable Axum buffered JSON body limits
#409 16499531 Axum safe diagnostics and trusted proxy metadata
#414 1d89fb4e Native AWS configuration, secret and KV store providers
#422 e9459356 Native celld configuration and KV store providers
#439 c02ee549 Pluggable native Geo providers and protected CloudFront ingress
#469 61fd14d7 Standard JA4 request interface (#283), including Axum JA4 from a trusted proxy header

Moved since f84ffbbb

None.

#463 closed on 2026-11-13; #422 carries its conditional celld record operations, which this branch already has.

How #275's next review repairs came in (2026-11-17)

#275 moved from b65e7144 to ea2549fb by adding 16 fix and docs commits (Fastly response handles and progress wakers, retained outbound failures, body checkpoints, harness supervision, CLI target pinning). #422 had added a stock-celld store service (dd1b8907, 15bdeef6), which #439 merged in cf291a1e. Each stack PR then merged the PR below it, bottom-up, with no conflicts, and this branch took #439's head c02ee549 as a plain merge, f84ffbbb.

How #275's review repairs came in (2026-11-16)

#275 moved from e9ffaa8f to b65e7144 by adding four commits:

Each stack PR merged the PR below it again, bottom-up, in a merge commit titled Merge PR #<lower> into PR #<N> for outbound compatibility stack. Only #409 conflicted. Its merge resolves the import block of edgezero-core's app.rs by keeping both imports: #409's RouteErrorKind and #275's RequiredErrorResponseHeaders. This branch then took #439's head c1cec8e7 as a plain merge, 3d92ee38, with no conflicts.

How #275's rewrite came in

#275's head was rewritten at e9ffaa8f. The stack's conflicts were not resolved here. Instead, each stack PR merged the PR below it, bottom-up, and resolved its own conflicts in its own merge commit, titled Merge PR #<lower> into PR #<N> for outbound compatibility stack. Run git show --remerge-diff on a PR's merge to see exactly what its resolution changed. This branch then takes #439's head in a single merge.

PR Merge Conflicting hunks Resolution
#499 cf8003f1 9 Takes #275's CHANGELOG, SUITES.md, plan and Fastly callback-scope fixture; #275's never-ready upload replaces #499's string body. Keeps #499's received-head commit unchanged, its framing-receipt expect, and its byte-bound assertion under #275's record caps
#460 03d192fd 1 #460's three-policy contract loop on #275's executor handle
#406 b3187e1b 6 #406's run_local and run_owned structure, which now owns #275's AxumOutboundExecutor
#407 77fa6772 8 Keeps both forwarded_content_length and ingress_buffer; with_transport takes the executor and the JSON limit
#409 e1350bb2 8 from_app_with_native_client_factory takes the executor; dispatch keeps #409's into_parts and inserts the executor
#414 bd6cb7ab 0 One test gets an executor
#422 f1d85581 0 None needed
#439 302697e8 3 with_native_transport takes the executor; both the executor and geo fields

Edit in this branch's own merge

87174160 merged #439's head with two edits where #469 meets #275, and git show --remerge-diff 87174160 shows both. One is still this branch's own:

Edit Why
request.rs: #469's ingress_ja4_is_not_exposed_even_with_ja4_headers test gets an executor handle #275 passes the Axum outbound executor through into_core_request, and the test does not compile without one. #469 targets main, where the function still takes one argument, so the edit cannot live in #469 until it rebases onto #275

The other removed EdgeZeroAxumService from the Axum guide, because #275's check_outbound_legacy_api.sh rejects the name. That edit now comes from #469 itself (52f4a09f, the suggestion in its review), merged in 10166628 with no file change. It was the only red check here before.

Open points for the owning PRs

Point Owning PR
The request.rs edit above #469, or #275 if it lands second
Wire evidence over 1,024 records now fails, where #499 on its own accepted any count within the byte bound. Today's captures fit: the Fastly test uses 518 records and the Axum capture has 431 #499
Eight std test fixtures read accepted sockets that inherit non-blocking mode on macOS, so local macOS runs fail with WouldBlock (#503) #414, #422

Not included

PR Why not here
#389, #401, #444 Ready, but they conflict with #275 and land after it; no identity ticket waits on them
#452, #466 Drafts that land after #275 (#466 after #444); the MVP does not wait on them
#464 Draft, post-MVP
#454 Prototype stacked on #439; #464 drops its commits
#287 Lands last, after the identity work
#502 New and ready, for #482 (Axum geo bound from the manifest). It is stacked on #439's previous head; its text merges cleanly onto 87174160, but it has not been built here. Next to add

Next on this branch

Milestone Tickets
R1b (#489) Record contract with listing strong within a partition (#472); DynamoDB and celld providers on Axum (#473)
R2 (#490) Bounded work after the response on Fastly and Axum (#476)
R2b (#491) ClientInfo contract (#475); Fastly and Axum ClientInfo (#90, #92); Axum geo bound from the manifest (#482, PR #502)

Each ticket's PR is merged here once it is ready. #482 is the only one with a PR so far.

Refs #488. Part of #468. Planned in IABTechLab/trusted-server#1559.

Test plan

Check Result
Every head in Included is an ancestor of 3d92ee38 through history-preserving merges Pass
10166628 has the same tree as 87174160 Pass
Each refreshed stack PR, locally: fmt, workspace clippy, workspace tests, and tests of the crates it touches Pass, apart from failures that also fail on that PR's original head
Every host step of test.yml and format.yml, locally on macOS, on #439's refreshed head and on 87174160 Pass, apart from the macOS-only failures in #503
check_outbound_legacy_api.sh and check_outbound_docs_contract.mjs on 87174160 Pass
Trusted Server's 27 CI gates against 10166628 (IABTechLab/trusted-server#1506 and IABTechLab/trusted-server#1608) Pass
CI on this PR at 10166628 30 of 30 pass. cache-restore-seed failed once on compiler-cache publication and passed on rerun
CI on every refreshed stack PR and on #469 Pass; #407, #409 and #439 needed the same deploy-workflow rerun
2026-11-16 refresh, each of the eight stack PRs locally: cargo fmt --all -- --check, cargo check --workspace --all-targets --features "fastly cloudflare", cargo clippy --workspace --all-targets --all-features -- -D warnings, cargo test --workspace --all-targets Pass on all eight: 2,762 tests at #499 rising to 2,973 at #439, none failed
The same four gates on 3d92ee38 Pass: 2,990 tests, none failed
2026-11-17 refresh, the same four gates on each of the eight stack PRs Pass on all eight: 2,787 tests at #499 rising to 2,997 at #439, none failed
The same four gates on f84ffbbb Pass: 3,014 tests, none failed

Address review thread 4491180380. Verify coverage-generated applicability through release validation without approving pending scope.
Address review thread 4491174084. Service ready SDK work without a host wait, record each terminal pipeline turn before further provider I/O, and preserve original deadlines and cached results. Replace closed-port timing assumptions with deterministic readiness and late-collection proofs.
Address review thread 4491175086. Identify removed Fastly environment helpers, document baked hook replacements and adapter-owned delivery, and match the current tool pins.
Address review thread 4491175244. Reuse the paired absolute timer so fractional-millisecond and early wakes cannot become early 408s. Preserve timer failures and verify pending-source release.
Address review thread 4491174465. Sweep every pending pipeline once at cutoff, retain earlier own-deadline results, and release the timer and exchange collection before terminal publication. Verify raw events and the full positional collection contract.
Address review thread 4491176481. Remove the obsolete eager-dispatch dependency while leaving consumer parity and exact-candidate qualification open.
Address review thread 4491175714. Keep zero-read caller overflows retryable, ignore mutated framing headers, and invalidate only the caller length hint after stream mapping. Preserve protected raw caps, deadlines and sticky failures.
Address review thread 4491176612. Retain explicit Rust 1.95 allocation-audit provenance rather than claiming an unperformed 1.98 audit, match the Docker builder pin, and document shared Arc<App> ownership.
Address review thread 4491176729. Include wire authority, connect settings and B31 identity, identify the replaced historical model, and warn against untrusted destination selection.
Address review thread 4491176874. Describe adapter-owned delivery, initialize before request acquisition, fix response types and registry counts, and provide a complete context handler.
Address review threads 4491177045 and 4491179663 atomically. Correct portable declarations and authority caveats, document the default timeout budget, and reject stale delivery wording and incomplete limit tables.
Address review thread 4491177206. Publish the informational host-certified-empty behavior row, preserve the unverified Workers leg and Spin CL=0 exception, and describe current settlement and 408 precedence without promoting raw ingress guarantees.
Address review thread 4491177323. Add Original, Begin, nonblocking check and arrival-recording matrix rows with explicit non-declarable status and Fastly cooperative-progress caveats.
Address review thread 4491177465. State the twice-budget risk, original-entry measurement anchors, expired-preparation exclusion and original post-head deadline without promising a finite host-call horizon.
Address review thread 4491177586. Remove active dispatch-slack claims, name header/body timeout provenance and the measured tolerance, and retain all three synchronous preparation exceptions plus the separate optimizer limitation.
Address review thread 4491179963. Do not execute inherited toolchain Cargo metadata through Bash. Reuse one command factory, retain sentinel and runtime settings, and cover SDK and async-build command construction.
Address review thread 4491178015. Scope echo_stdout to Fastly, document the fallible configure macro argument, and distinguish the config_out_of_date wire kind from Rust variants.
Address review thread 4491177715. Document both stock-runtime limitations, append the already-approved local runtime clarification, and refresh only complete-document identities. Preserve all 255 criterion records, environment legs, strict parity requirements and hosted gates.
Address review thread 4491177865. State per-target observation opportunities, non-yielding CPU delay, no backdating and the earlier own-deadline exception.
Address review thread 4491178161. Include the full audited worker requirement, the scaffold Spin pin, and the actual repository boundary of the action toolchain check.
Address review thread 4491178345. Import response types from their actual modules, identify the application-owned schema, and remove obsolete body/request accessor documentation.
Address review thread 4491178492. Router state wins on every target, followed by Fastly preparation and the adapter default, while manual missing-client behavior stays explicit.
aram356 and others added 30 commits November 16, 2026 11:10
Brings #275 at b65e714 and the refreshed heads of #499, #460, #406,
#407, #409, #414, #422 and #439. Each PR merged the one below it, so
this merge has no conflicts. #409 resolved the one conflict on the way
up, in edgezero-core's app.rs imports, by keeping both.
…ck celld

The celld providers depended on a scoped listener compiled into a modified
celld. Stock celld only exposes storage to Worker code deployed into it, so
EdgeZero now ships that code: services/celld-store, a Worker plus one SQLite
Durable Object per namespace, deployed with `celld deploy` onto the official
release.

- Each mutation applies in one SQLite transaction and records its client
  mutation ID. Stock celld resends a buffered Durable Object call after a
  pooled peer tunnel fails even when the owner already ran it; the ledger
  answers that resend with the first outcome. An apply-before window keeps a
  call held through cell recovery from applying long after the client gave up.
- Responses carry a new protocol header and a store instance ID, so forked
  servers and reset stores fail instead of answering.
- Mutations are POST /put and /delete with a fresh 128-bit ID; the client
  still never resends.
- Remove the celld config provider and the fork-only v1 record API.
- Replace the modified-celld runner and namespace isolation script with a
  generated-consumer proof against official celld behind a TLS proxy, and a
  two-node fleet proof that reproduces the resend and an owner takeover.
… tokens

Review follow-ups for the store service:

- A 404 counts as an absent key only when the store instance header is
  present. A routing 404, such as from a proxy that rewrote the path, is now
  malformed instead of silently reporting existing keys missing.
- The Worker accepts any ASCII graphic token, including commas, and still
  rejects repeated Authorization headers by grammar.
- The Kubernetes deploy recipe maps index.js back under src/, because
  ConfigMap keys cannot contain "/".
- The spec no longer claims to detect a rollback to an older snapshot of the
  same store.
Brings #275 at ea2549f and the refreshed heads of #499, #460, #406,
#407, #409, #414, #422 and #439, including #422's stock-celld store
service and its merge into #439. Each PR merged the one below it, with
no conflicts on the way up, so this merge has no conflicts.

This branch has not been deployed

No deployments
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

Integration-branch revision with the #275 to #439 chain

4 participants